gsk: Rename shaders for OpenGL

diff --git a/gsk/gskglrenderer.c b/gsk/gskglrenderer.c
index 96f04afe7d0c3aad65995f604a3ed7acc4ff95f4..c6037cfb8c5b430d5f23cfd280d654af465149ad 100644 (file)
--- a/gsk/gskglrenderer.c
+++ b/gsk/gskglrenderer.c
@@ -298,18 +298,22 @@ static void
 gsk_gl_renderer_create_program (GskGLRenderer *self)
 {
   guint vertex_shader = 0, fragment_shader = 0;
+  const char *fs_path, *vs_path;
   GBytes *source;
   int status;
 
+  vs_path = "/org/gtk/libgsk/glsl/gl3-base.vs.glsl";
+  fs_path = "/org/gtk/libgsk/glsl/gl3-base.fs.glsl";
+
   GSK_NOTE (OPENGL, g_print ("Compiling vertex shader\n"));
-  source = g_resources_lookup_data ("/org/gtk/libgsk/glsl/base-renderer-vertex.glsl", 0, NULL);
+  source = g_resources_lookup_data (vs_path, 0, NULL);
   vertex_shader = create_shader (GL_VERTEX_SHADER, g_bytes_get_data (source, NULL));
   g_bytes_unref (source);
   if (vertex_shader == 0)
     goto out;
 
   GSK_NOTE (OPENGL, g_print ("Compiling fragment shader\n"));
-  source = g_resources_lookup_data ("/org/gtk/libgsk/glsl/base-renderer-fragment.glsl", 0, NULL);
+  source = g_resources_lookup_data (fs_path, 0, NULL);
   fragment_shader = create_shader (GL_FRAGMENT_SHADER, g_bytes_get_data (source, NULL));
   g_bytes_unref (source);
   if (fragment_shader == 0)

diff --git a/gsk/resources/glsl/base-renderer-fragment.glsl b/gsk/resources/glsl/base-renderer-fragment.glsl
deleted file mode 100644 (file)
index 07458db..0000000
--- a/gsk/resources/glsl/base-renderer-fragment.glsl
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 150
-
-smooth in vec2 vUv;
-
-out vec4 outputColor;
-
-uniform mat4 mvp;
-uniform sampler2D map;
-uniform float alpha;
-
-void main() {
-  outputColor = texture2D(map, vUv) * vec4(alpha);
-}

diff --git a/gsk/resources/glsl/base-renderer-vertex.glsl b/gsk/resources/glsl/base-renderer-vertex.glsl
deleted file mode 100644 (file)
index 534f201..0000000
--- a/gsk/resources/glsl/base-renderer-vertex.glsl
+++ /dev/null
@@ -1,16 +0,0 @@
-#version 150
-
-uniform mat4 mvp;
-uniform sampler2D map;
-uniform float alpha;
-
-in vec2 position;
-in vec2 uv;
-
-smooth out vec2 vUv;
-
-void main() {
-  gl_Position = mvp * vec4(position, 0.0, 1.0);
-
-  vUv = vec2(uv.x, 1 - uv.y);
-}

diff --git a/gsk/resources/glsl/gl3-base.fs.glsl b/gsk/resources/glsl/gl3-base.fs.glsl
new file mode 100644 (file)
index 0000000..07458db
--- /dev/null
+++ b/gsk/resources/glsl/gl3-base.fs.glsl
@@ -0,0 +1,13 @@
+#version 150
+
+smooth in vec2 vUv;
+
+out vec4 outputColor;
+
+uniform mat4 mvp;
+uniform sampler2D map;
+uniform float alpha;
+
+void main() {
+  outputColor = texture2D(map, vUv) * vec4(alpha);
+}

diff --git a/gsk/resources/glsl/gl3-base.vs.glsl b/gsk/resources/glsl/gl3-base.vs.glsl
new file mode 100644 (file)
index 0000000..534f201
--- /dev/null
+++ b/gsk/resources/glsl/gl3-base.vs.glsl
@@ -0,0 +1,16 @@
+#version 150
+
+uniform mat4 mvp;
+uniform sampler2D map;
+uniform float alpha;
+
+in vec2 position;
+in vec2 uv;
+
+smooth out vec2 vUv;
+
+void main() {
+  gl_Position = mvp * vec4(position, 0.0, 1.0);
+
+  vUv = vec2(uv.x, 1 - uv.y);
+}